From: Ray Strode <rstrode@redhat.com>
Date: Fri, 14 Nov 2014 20:57:16 +0000 (-0500)
Subject: gdm: fix handling of removed smartcard at startup
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1471
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=5650355da56ab7744666d022d8b67095236fade1;p=gnome-shell.git

gdm: fix handling of removed smartcard at startup

If a smartcard is missing from the reader when we start up,
and the system is configured to disable password authentication,
then we need to ask the user to insert their smartcard.

This commit fixes that.

https://bugzilla.gnome.org/show_bug.cgi?id=740143
---

diff --git a/js/gdm/util.js b/js/gdm/util.js
index 4bfaf7c27..6286b84fc 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -410,7 +410,7 @@ const ShellUserVerifier = new Lang.Class({
     _updateDefaultService: function() {
         if (this._settings.get_boolean(PASSWORD_AUTHENTICATION_KEY))
             this._defaultService = PASSWORD_SERVICE_NAME;
-        else if (this.smartcardDetected)
+        else if (this._settings.get_boolean(SMARTCARD_AUTHENTICATION_KEY))
             this._defaultService = SMARTCARD_SERVICE_NAME;
         else if (this._haveFingerprintReader)
             this._defaultService = FINGERPRINT_SERVICE_NAME;